diff --git a/examples/Makefile b/examples/Makefile
index 8e329d7..d440bc5 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -1,6 +1,4 @@
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
+# SPDX-License-Identifier: GPL-2.0+
 
 ifndef CONFIG_SANDBOX
 
diff --git a/examples/api/Makefile b/examples/api/Makefile
index 9068727..476ca71 100644
--- a/examples/api/Makefile
+++ b/examples/api/Makefile
@@ -1,8 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
 #
 # (C) Copyright 2007 Semihalf
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 # Provide symbol API_BUILD to signal that the API example is being built.
 KBUILD_CPPFLAGS += -DAPI_BUILD
diff --git a/examples/api/crt0.S b/examples/api/crt0.S
index 5a7049d..57bba9d 100644
--- a/examples/api/crt0.S
+++ b/examples/api/crt0.S
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2007 Semihalf
  *
  * Written by: Rafal Jaworowski <raj@semihalf.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #if defined(CONFIG_PPC)
diff --git a/examples/api/demo.c b/examples/api/demo.c
index 8c30457..e177bf1 100644
--- a/examples/api/demo.c
+++ b/examples/api/demo.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2007-2008 Semihalf
  *
  * Written by: Rafal Jaworowski <raj@semihalf.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/examples/api/glue.c b/examples/api/glue.c
index 575c1e5..9c8ed8d 100644
--- a/examples/api/glue.c
+++ b/examples/api/glue.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2007-2008 Semihalf, Rafal Jaworowski <raj@semihalf.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/examples/api/glue.h b/examples/api/glue.h
index 91c8c1c..f974560 100644
--- a/examples/api/glue.h
+++ b/examples/api/glue.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2007 Semihalf
  *
  * Written by: Rafal Jaworowski <raj@semihalf.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/examples/api/libgenwrap.c b/examples/api/libgenwrap.c
index ba51007..67b2d64 100644
--- a/examples/api/libgenwrap.c
+++ b/examples/api/libgenwrap.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2007 Semihalf
  *
  * Written by: Rafal Jaworowski <raj@semihalf.com>
  *
- * SPDX-License-Identifier:	GPL-2.0+
- *
  * This is is a set of wrappers/stubs that allow to use certain routines from
  * U-Boot's lib in the standalone app. This way way we can re-use
  * existing code e.g. operations on strings and similar.
diff --git a/examples/standalone/Makefile b/examples/standalone/Makefile
index c9d6206..09364d8 100644
--- a/examples/standalone/Makefile
+++ b/examples/standalone/Makefile
@@ -1,9 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
 #
 # (C) Copyright 2000-2006
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 extra-y        := hello_world
 extra-$(CONFIG_SMC91111)           += smc91111_eeprom
diff --git a/examples/standalone/hello_world.c b/examples/standalone/hello_world.c
index bd8b392..1f61bb4 100644
--- a/examples/standalone/hello_world.c
+++ b/examples/standalone/hello_world.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/examples/standalone/mips.lds b/examples/standalone/mips.lds
index 849f0aa..163d6ef 100644
--- a/examples/standalone/mips.lds
+++ b/examples/standalone/mips.lds
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2003
  * Wolfgang Denk Engineering, <wd@denx.de>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/examples/standalone/mips64.lds b/examples/standalone/mips64.lds
index 865effd..d67396a 100644
--- a/examples/standalone/mips64.lds
+++ b/examples/standalone/mips64.lds
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2003
  * Wolfgang Denk Engineering, <wd@denx.de>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/examples/standalone/nds32.lds b/examples/standalone/nds32.lds
index 3097a16..5a04f43 100644
--- a/examples/standalone/nds32.lds
+++ b/examples/standalone/nds32.lds
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2011 Andes Technology Corporation
  * Shawn Lin, Andes Technology Corporation <nobuhiro@andestech.com>
  * Macpaul Lin, Andes Technology Corporation <macpaul@andestech.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 OUTPUT_FORMAT("elf32-nds32", "elf32-nds32", "elf32-nds32")
diff --git a/examples/standalone/ppc_longjmp.S b/examples/standalone/ppc_longjmp.S
index bf01daa..50dc2b9 100644
--- a/examples/standalone/ppc_longjmp.S
+++ b/examples/standalone/ppc_longjmp.S
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
 /* longjmp for PowerPC.
    Copyright (C) 1995, 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-
- * SPDX-License-Identifier:	LGPL-2.1+
  */
 
 #include <ppc_asm.tmpl>
diff --git a/examples/standalone/ppc_setjmp.S b/examples/standalone/ppc_setjmp.S
index 29c295b..d538fb0 100644
--- a/examples/standalone/ppc_setjmp.S
+++ b/examples/standalone/ppc_setjmp.S
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
 /* setjmp for PowerPC.
    Copyright (C) 1995, 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-
- * SPDX-License-Identifier:	LGPL-2.1+
  */
 
 #include <ppc_asm.tmpl>
diff --git a/examples/standalone/riscv.lds b/examples/standalone/riscv.lds
index 7d8c482..9a25861 100644
--- a/examples/standalone/riscv.lds
+++ b/examples/standalone/riscv.lds
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2017 Andes Technology Corporation
  * Rick Chen, Andes Technology Corporation <rick@andestech.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
  */
 
 OUTPUT_ARCH(riscv)
diff --git a/examples/standalone/sched.c b/examples/standalone/sched.c
index f2c4961..1c52960 100644
--- a/examples/standalone/sched.c
+++ b/examples/standalone/sched.c
@@ -1,6 +1,4 @@
-/*
- * SPDX-License-Identifier:	GPL-2.0+
- */
+// SPDX-License-Identifier: GPL-2.0+
 
 #include <common.h>
 #include <exports.h>
diff --git a/examples/standalone/smc91111_eeprom.c b/examples/standalone/smc91111_eeprom.c
index 38faded..5ffefc8 100644
--- a/examples/standalone/smc91111_eeprom.c
+++ b/examples/standalone/smc91111_eeprom.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2004
  * Robin Getz rgetz@blacfin.uclinux.org
  *
- * SPDX-License-Identifier:	GPL-2.0+
- *
  * Heavily borrowed from the following peoples GPL'ed software:
  *  - Wolfgang Denk, DENX Software Engineering, wd@denx.de
  *       Das U-Boot
diff --git a/examples/standalone/sparc.lds b/examples/standalone/sparc.lds
index 7461eda..30719a3c 100644
--- a/examples/standalone/sparc.lds
+++ b/examples/standalone/sparc.lds
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2003, Psyent Corporation <www.psyent.com>
  * Scott McNutt <smcnutt@psyent.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */